Update solutions and add exercise 2