Flattened manifest/queries
Merge pull request #9 from derekdowling/flattened

Flattened manifest/queries