A lot has to be changed in the solution class to compensate for this change. This is a work in progress.