Assessment event tracking

+1, added a cleanup/refactor task to the backlog