Add events. Fixes #32