Events now tied to individual users
Merge branch 'events-to-users'