Move things around
Solve problem 7.
Merge origin/master