More work on commands. Command scoping in progress.