more work on event handler system