WIP: Simplifying event handling