Moved events to core file.  Tested and made adjustments.