Initial exercise 1b,2,3 commit