#37: Added a lot more code in support of widget models