Continued implementation of new template engine