Hah, yeah if you don't have a comprehensive test suite any rewrite will be a disaster - step one is to get the test suite up to code.