Refactoring FraController (again…)