new events
Merge branch 'master' of https://github.com/codemkrs-team-name/codemkrs-challenge
got everything working with actual timestamps