Move the templating up higher