More polish and fleshing out.