Implemented final touches on the event piece
Merge origin/master