wip/jumpnbump/patches
