Clean up, add some problem skeletons, solve #6.
Fix indent.
Solution #7, with a small benchmark experiment.