Completely refactored AggregateEvent handling. Draft.