Moved CoreEvent to services package and implemented it. May still need tweeks later