WIP: Ws client code