WIP: Taking over PD support form sarsate

Clarified.