Temp commit
100% widgetified
Some adjustments
Merge branch 'widget'
0.0.8