Updated Client/protocol.  Currently untested