Closes #1 Added event generation
Closes #1