Move stuff around, again.

Need to teach it in the right order ...