Started to add remaining event data population code
Merge remote-tracking branch 'origin/master'