Working on some connecting / disconnecting issues