Beginning refactoring of server message protocol.