Still working the templating system