Rooms are not working properly, committing before major refactor.