Finished Preliminary Room Options
Merge remote-tracking branch 'origin/RoomOptions'