I absolutely want the API client pulled out into a separate class. This class has too many responsibilities atm.