WIP
Initial working version of pre and post all query objects.
Digging my way out of rebase conflict detached head hell!