EventStreamSpec almost done