Event refactor
Start move of Services into Managers