Update 2

* Skeleton for adding new events to classes