updated client to match api refactor
merging in with server changes