Made changes and modeled (roughly) divvy shortage