added handlebars back into the mix