Working on the medal calculations