Refactored the distance feature, added a meter based version