wip/emerald/patches
