Changed the Query class, now building queries with "combinators".
Added a few basic combinators along with some test cases.