in the midst of wordform refactor