more work on client server code
more changes for client server
more integration with the old code base