2.0 Events

Refactor for before and after events.