Massive refactoring and walls collapsing.