Fleshed out itinerary logic.