Add simple query function
Add very basic query class
Switch to new query
A fair bit of refactoring
Add query test
Move path out