bits and pieces
Fixed merge conflicts
Implemented the getAllEvents service