going to push a PR with just an initial

--query

option in a bit, no pipelining or anything