First cut of Query object