Halfway through major refactoring: "I think this is one of the cases where it would have been nice to have some working unit tests first.";)