Do we want to fix it, or refactor it all now?