Consolidated the solver to use one solve method for both phases. I think the solver would work if the class restructuring were complete.