wip/ozymandns/patches
