restarting code gen

in a marginally more organized fashion.