moved some requests to ApiClient, need to pass more