flight indexing and crud nearly 100% complete, needs screen scraping tweaks
pre master merge
Merge conflicts