More work on client/server.