Edited codegen

Still have shift/reduce