WIP: Further updates for new word war logic