Starting to really fill out the Query class