wip/nomadio/patches
