Milestone 2 - almost there

Bug: to many neighbours