Finish user events, probably still needs event view
Merge branch 'event-model'