Added ability to switch rooms, did a little refactoring