Addressed 2/3 of my todos in hncp_pa.