More work on saving models.