Add event system
Merge branch 'eventSystem'