wip/fairymax/patches
