wip/graveman/patches
