Final commit for the night, more event work