exercise 1&2 finished