More work on the commands.