gradual reforms

Could not connect to the API.