Refactoring goes on, moving toward a new design.