Final model updates

No doubt changes to make