The Great FE Refactor part 7
Fix economy
Pretty much done..