Integrated the new PI code, plus some plans under the Plans folder.