moar templating changes