Flesh things out a little bit more