Moving calls to client helper while I'm at it
285 files changed