Events Upgrade Path

**NOT READY FOR REVIEW**

Just opening pull request to build on