Part 1 Bug Fixes: Multiple clients are now supported.  Part 1 is now Done