add in handlebars and map