Refactored and simplified some things to start over with the event store