Proximity tracking WIP