Refactored apDataService so all calls now use serviceWrapper to communicate with the server.  Should allow easier time building mocks and more consistent handling of errors.