wip/nuvie/patches
