Finalised the group by count functionality in CDataWrapper; rewrote the test suite.
Need to see how to integrate the group by with the GetAnnotated service.
Deleted the Resolve service: was not sure what it did and it didn't work.