Assorted cleanup + notes
move source around
Start to clean up error handling
handle JSON errors better (WIP)
Add some query tests
Flesh out an experimental query module
Finish moving to the new query, update example