The Great FE Refactor part 9
Baby steps, baby steps..