So I'm totally getting used to this - Implemented the events via a service provider