Tables v2 c

No going back.  I guess the next checkin you can start deleting v1 widgets.