Made the server client working