Finish work on new Command API for first.