Hmm yes I like this better. If I'm not mistaken I should still be able to use the same handlebars template. Will refactor.