Now supporting plural strings, lots of other changes.