Got rid of the generic collection protocols
Cleanup
Fixed equality check
Basic support for combining queries
Added raw query
Cleanup