Write proximity tests
Write proximity parameter
Rebase off of develop