More work on template engine.