Rework the load/stores, add new itineraries