Merge Tim's feature/hoodie integration into Doug's feature/create_proximity_searches