Added Flight class + changes