Finished WordList Refactor