Word addition refactor begun