Templating finished.. at least by now