Re-wrote the proposed solution section.
Merge branch 'rlyerly'