Solved two more trivial challenges
Solved challenges 2 and 8