Adding user proximity testing