A bit easier way to doing challenge 2
Added solution to challenge 5