Progress on templated code generation