Change how event is created

Fixes #4