wip/crossroads-io/patches
