Feature/create proximity searches

Merged Tim's and Doug's changes