Added the template 'helper' and such