Refactored Acme Airlines and some bug fixes to make sure it works.