Updated challenge 2 and 4, started challenge 3