adding code for the demo-client.  Also removing .bak files, since they are already in the history