More work on new command