Adding challenges 5 & 8 (8 needs reflection still)