Work on code generator