events now indexed by tokens, updating style to match mocks