Finished up CoreEvent, untested though.