Get bundle working again and update handlebars