Beginning work on finalizing the widget
Widget is looking shippable
merged