Rework neighbourhood
Neighbourhood is now an enum