Continued changes to generation

Nearly done with the pure generation, not started on the drawing