wip/hawk/patches
