refactored airport and added rather dubious grand finale spec