Bottom of the world cleanup
Spaghetti, regressing to elder commit due to incompatibility.
Added RockCeiling