Making some changes from the wordsmithing doc, want a clean slate before continueing...