Add widget class, but didn't do very well...