So... Portugal already have CS classes for almost 20 years. Don't know what they teach now but everyone would know how to use windows, word and excel (specially kids without computers). My course was computers (what was called back then) and we spend half an year doing logic programming in paper and algorithms...
Any class that teaches programming should always start with logic programming, because you can apply it to any language...
Example: my latest programming class was 3 years ago, I did a CNC course (to work with machines that make molds... Think a 3d printer that cuts steel instead of pushing polimers) and my first question was :don't we start with logic programming or algorithms? The teacher first teased me... Then asked what is logic programming....
Resuming... At the end I was the only one who could use functions and variables... (check g-code and heidenhein, you'll get it).

Other then that I was the only one who got a job working cnc machines, everyone else that also got a job whent for the manual labor part (the molds are finished by hand)...

So... My thoughts... Any CS class that teaches programing should start with logic programming and algorithms... That's the foundation to learn any programming language.