wip/arpdig/patches
