Progress on the code generator