work in progress - event overhaul