Did some work on the Client/Server code.