OO refactor, wall destruction.