Adding basic event model
Added basic event model
fixed merge conflicts