Starting to refactor and update for just WordArcher.