In the middle of some major Query refactoring.
More work on new Query structure.