Added Solver and finished model