Begin adding templating