prelimiary support for parsing and printing split queries

Peter, can you take a quick look and see if this seems like a reasonable approach so far?