Work on templating system