working on TwoDSolver