started working on client.
merged