Updated to use handlebars
Lots of improvements