Working on code generation