Ok Jason, lets talk rebasing. I'd like to get a release of setup out before this gets integrated in. Setup is one feature away fro mfeature freeze so that shouldn't be to far away. Did my rebasing algorithm seem correct to you? If not, lets talk what it should look like. Rob