Add solution for challenge #2
Add solution for challenge #3