Merging character red-green-refactor before switching to character branch in earnest.