Feature/create proximity searches

This should merge my changes and yours