Untested. Split flightapi out into a lot of files.