Refactor collection to resultset. Refactor of query class to add getters for built properties. Lots of cleanup to be done