Adding some templating to run