Solver

Code review for december 3 to 5 changes