Refactoring partial commit - things still work