More work on implmenting commands.