the templating system is now much more complete