Moved Room controller code into it's own controller