Real progress with the refactoring.
Refactoring works!