Roster checking / announcing
Refactor some code