finished first 1/3 of Exercise 4
merged files