More events

Closes #28