Started work on code generation