Revert "Revert "Added Distance Tracking""

This reverts commit c72b66650a03a3f0d5469ade3144da6ff26afa2c.