Updates in prep for event system

event system prep