All of the todos (except checking null honorees) are done

Checking for null honorees will be done in master. I might wait until
merging this branch into master before making that change.