Oh, sigh.  Yet Another attempt at this git mess.