Update Switch command

Should all function as before, but now reads duration correctly + mostly
matches the new 0.9 command coding standard