complete rewrite;
custom mustache templating or native fallback;
new router
fixed merge