First pass at Issue #39

Issue #39 is a doozy.  This PR is an attempt to handle at least parts of it for 3.8.11 and spin the rest off to next round.