changes
big segue changes and most transitions are working
Changes and tweaks to submitted viewWillDisappear
Resolve conflicts