refactor all the things
fixing some extraneious refactorings
correcting some overzealous refactorings
a comment update
Working out naming and bugs in query builders
The most exciting commit - it works!