Initiali commit of exercise 6