More fleshing out of the code.