rewrote event system, for only one method in Handler
changed classes to use new event system