So I was just figuring out that I was sabotaging my efforts because I didn't want to delete my own obsolete code, and replace it. The code was meant to be a temporary hack from the beginning, but when the time came I didn't want to axe it. Corwin said it is easier for him to delete code if he has it committed to CVS first, because it is easy to get back the old version. I think it makes sense for me to do something like that. I probably won't ever want back the old version, but it makes it easier to move on when you know you can always move back.
I think I am going to have to make life changes soon that I might not be able to move back from. That will be much harder to do.