Organized the API calls a bit