Index on EventId

Move from indexed events to k,v pairs
Continued Updates to index by EventId