wip/wordwarvi/patches
