More fleshing things out.