more red-green-refactor progress