Add mustache templating
Resolve merge conflicts