finished subclassing of Query class
bug fixes to clean up Query subclassing
resolved conflicts