Filled in a lot of the model