Add diagham_command to only create the command string and add option wait to run

Add diagham_command to only create the command string and add option wait to run #3