Exercises

Addresses about the first half of #20