Query builder odm refactoring for new ODM Query and Query Builder

This is theoretically finished, in as much as all the tests pass. Will test it out in battle later today.