This version is for adding features that will involve major changes and so will take more time to do, e.g., supporting multiple-group models.