The rest of this very odd diff for this file is because I moved a bunch of methods around which are going to be removed in a future card.