Server and Client v1

updated server and client.