More major refactoring, focused on design.