WIP: Simplifying event handling
WIP: Simplifying event handling
Changed start event to ready
Done simplifying event handling
Merge branch 'simplify-event-handling'