Complete Proximity API

All done.