Is it ok to merge this and then we can have a separate discussion on how to improve the widget objects separately?