Started work on code generator