Finished rejiggering SolutionGenerator; but now doesn't work like it
should.