Continued implementation of template engine