Flesh out more of the model