Add week2-event-handling