wip/mxallowd/patches
