The Great FE Refactor part 10
Almost there...