Change addUser and disconnect to use announcements rather than messages