So I *think* this is working.  It is very edge case riddled and I need to fix it up, but I want to move to my main machine.  I REALLY should setup a better branching strat. besides just using the master line…..