Worked on tutorial 1 events. They should work mostly now.
Resolving conflict