wip/hztool/patches
