wip/commandergenius/patches
