Some suggestions for pr-93 branch

Hi Andrew,

Here are some suggestions of how I might do pr-93, feel free to incorporate them as you see fit.

Jonah