First commit of Exercise 6