Flesh out model a little more