[WIP] Refactoring for QbV2

This is just a first, untested, pass at implementing the new QB API and it also suggests new features for the new Query Builder which I will comment on.

Fixes #171