TwoCellNeighbors possibly generalized
Some cleaning - still one element of 3D TODO