Events can now upload images
Merge conflicts, tried to fix