I'm unclear what this commit is for, but I have to get these out of the way before I can merge my most recent changes from the 'testing' branch.