First attempt
Merging corrected
part 2 finished