more intermediate work.  I'll squash these commits, but I don't want to
delete them entirely as there is legitimate "by-hand" work hidden in
here