More work on the templating portion