Updating to add forgotton Handlebars stuff