fleshed out Query.generator.  hit issues with modeling a Query