wip/dumb/patches
