F itinerary

This branch is all ready. Please check to see if all tests are passing green and functionality is there.