One small step for man...
Holy crap, down to one failing test! (and loads more refactoring, cleanup and documentation :-))