Added: Added all remaining changes for iteration 0 except for shutdown.
Removed clutter in client.