Greatly enriched (though still nowhere near complete)