More refactorbation, got neighbors working again