neighbourhood part manager
fix merge
Merge branch 'joshhartigan-patch-1'