Resolve merge conflicts
Finish exercises 3, 5, 6
Straggler (?)