Added Mustache, improved model/controller