Starting to refactor codegen
Continuing to refactor codegen
Working on making the tests pass