Started implementing query structure
Merge branch 'master' of https://github.com/jenseh/happah