Almost working walls
merge