Updated to use CMD/CMDWait w/ Class_Console