Finished the query builder; moving to next target (todo: merge, fix tests)