EventStore work in progress