More tests.  Slight API changes.
Merge remote-tracking branch 'origin/master'
More ideas writeup.
Slight reworking.