Working on events
Merge branch 'JonsBranch'