Get new room setup working