All functionality working. Changed dist_calculator to trip_model