Neighborhood

Add basic neighborhood support