wip - new Airline structure