Added a deftemplate section that actually works