Fixed Adjacency completely (I think)
Introduce Adjacency tracker
Merge pull request #137 from aeoncleanse/3636-release

Fixed adjacency