Fleshing out more of the command line bits.