User events dependent on users
Merge pull request #79 from paulcox24/Cleanup

User events dependent on users