Refactored some stuff in upcomingEvents.js, need to refactor som loops still