Added mako for templates, integrated query + description