end of a long refactoring run...
tests green