Added some hamlet templating