Added pp6.
Added pp7.

Not the most elegant version, but uses all that is already known and it
works.