Event tracking

Not sure of what ticket number this is.

All tests pass.