Refactoring and breaking everything