again stashing work from today.  This does not really represent
any progress over previous commit.