Got rid of the MOCKDATA dependencies. We should be completely dependent on the API now.