made all api commands take in Client instead of ClientId