Hooked up events and added Flight module