reworking the way events are handled... all through eventManager
cleanup to sync with repo