Moving all API calls into a service
Moving all api calls to a service