Queue missing resultsets2

This is a second take on this PR.  Made a new branch so that I could get on top of the latest master without rebasing the old branch.