wip/chrsh/patches
