big templating changes