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