Adding more events

Closes #27
Closes #28
Closes #30