Changed all events to not be pointers