Generators done (?)

Commiting in case box crashes while I smoke.