Submitting changes for the night

All tests broke somehow, qq.  Will need to fix before pushing to
remote.

General work on building up the Dive feature.