Up to exercise 2.5
Up to exercise 3.1