ModelWidget class refactoring checkpoint.