Feature/create proximity searches

I merged your changes into mine, then am sending the combination back to you.