Implement pending requirements for edited text

Cf. Simon's overview in Google Spreadsheet.

Edited by Michelle Weidling