Started adding watching for arenas. Refactored rooms