Generator / Solver

Generator and Solver methods working properly