Refactored class problem and solver.