More work on commands.