added my stuff from exercise 1