The Great FE Refactor part 11 - DONE!