I want this one to succeed, but refactors often fail and revert to the original code structure :)