Reworking of the Events actor. WIP