changed to more object oriented flight class