WIP: Taking over PD support form sarsate

Will generalize when we have more than one solution.