Added passport
Use handlebars
Cleanup