First cut at including trip data