More progress on model baker.
More work on model_baker.