New template engine, lots of TODOs