wip/vimb/patches
