Fixing neighbours
Test now all passing