#32 combined WidgetFactory and WidgetFactoryBase
#32 combined WidgetFactory and WoidgetFactoryBase