Add stuff to exercise 2