Working version before adding Eventsourced replay