committing changes(not sure what) from last night.
created methods for find all events by site id and some router events/tests
working on adding aggregate site data method queries
fixed merge conflicts