Adding flights + some more restructuring