Removing Itinerary, it was adding too much complexity
Renaming variables and methods for clarity and data is now formatted into a hash