Moving over event queries to the event model
Merge pull request #16 from andybooj/development

Moving over event queries to the event model