Refactoring it - more testing and using Futures to find neighbors faster