Moved over to handlebars templates