Even More Work on Modify Flight

Finally figured out the logic I want to use