A little more clean up and finally have a basic client/server POC working with multiple clients