moar templating changes
this is getting silly