Began Widget refactoring.