Third round of revisions.  Packages panel modifications to come.