Further work on SolutionGenerator
Oops