Merging fixes
Merging fixes
Events WIP
Events routes.