Changed to templating with handlebars!!