Proper events

Proper events are no events! WIP