Revert "Team Room"

This reverts commit ef577d68de855078affc3a9484c5760abd884452.
Revert "Revert "Team Room""

This reverts commit b1d2c8ae8d7dd9c262be04ec3a37d9b66a80c4e4.