Added user and flightpath objects
did stuff