wip/gosmore/patches
