wip/heimdall/patches
