integrating current mockup to our new architecture (with handlebars)