Problem 22 & Organizing.

Uploading Problem 22. This also contains a small improvement on Problem
10.