All,

doing the rebase may not be as hard as I first thought; I am playing
with it now and I'll let you know what I come up with.

William