Stepped away from using events

Events get messy real quick, plus can be a resource intensive process.
You now have to instantiate the service.