Add a set of basic queries
Breakup queries + tests
Add path matching logic
Add in more complex queries