Drafts, typescript, corrected


17034094