Draft, typescript, corrected


16536582