Consolidating Event and Notifications. Only a few more modifications remaining, but version is functional