problems merging
handin for part 3