Finished up to #3

4 is apparently a proof I'm just supposed to read and not do; will not accept
this until I've proven to myself that I'm too stupid to do it myself.
Finished PT6.2 #4

Mostly committing for machine switch