Update client to talk to broker (work in progress)