Enable multiple simultaneous connections

First pass -- works, but needs some TLC