Almost done with events. It's still a mess -- I need to get the
factorgraph/conflict resolution mechanics in place asap.