Eventstore update

[carsonfarmer]

Here's a relatively big one. If there are conflicts (there will be) I'll handle them later. Time for a discussion...