Add solution for 1
Add solution for 2