Add various parts of PA 2 and the beginnings of HA 6.