Changes to client and server to get them talking