Connect/disconnect handling...kinda broken.