Refactoring, add handlebars for templating