add sort order for event
add events without user logic
merge conflicts
Merge pull request #26 from ahsterling/steph

Steph