add mileage calc
merge conflicts and add Mileage to master