time for major refactoring
working on _swapWall
working _swapWall!