New widget mostly done