Latest changes for events

Signed-off-by: Adam Allen <adama@namm.org>