WIP: Event tracking, update body text, closes #1