Fleshing things out a bit