refactorings
stuff is working, and handlebars is bugging