Finish up templating