Initiali commit of exercise 7