Almost finished working on the solver.....