Added Solver (not complete, with errors)