MEDIUM / Refactor FGE / WIP