Version 1.7 in pieces

This is the PL stuff.