wip/fnord/patches
