Cleanup and stub Solver class
Solver refactoring (Broken)