Event additions

Addresses #3