added ServerHandler to the client as well