Templating changed to handlebars