I know, I know. Refactor incrementally with a test wall at your back. To that I say "pssshhhhhhaaaaa".