Continuing to re-factor to support pagination and sorting. We have failing tests and will be sorted soon.
Fixed compilation errors.
Re-factor to support pagination and sorting complete. All tests are passing.