Commiting the working client

This is working client and server.