command/watch: First pass at command