Moved distance calculations to use my own haversine function