Still a bit wonky and needs more work, but at least the output
is not longer absolutely terrible and unhelpful.

Looks good with basic case, but almost certainly breaks with
many edge cases.

As opposed to them all being crammed into the "queries" file
with other various queries.