Converted most commands to use new COMMAND function