[HG] more work on models.