First commit for FGE revamp