Update 3

* Classes and events can be added and removed