started working on integrating the client with the server