WIP: Taking over PD support form sarsate

covereged below.