Minor room rejiggering so it's all one map now.