V1

Updated generator code to be a little simpler.