OK more refactoring.