This is the 2nd commit for Olympics Midterm app; Refactored code, now it's working, finally