Add missing files from Nathan's crt branch.