Deleted Query
Started rewriting Query class, separated from protoQuery