[WIP] Neighborhood iterators

I see that this is right here, and I think you were going to update the one above, sorry started reading from the top. :)