Finishing revamp of events :+1: for issue #7