Nevermind about repairing the structure.
I feel like we're playing refactor tag.