Rethinking the Text design and refactor in progress.