Right, I agree--this is going to be reworked anyway.  Moving around the existing code is just a first step.