WIP: Taking over PD support form sarsate

Fixed this path to include ro/rw which should address your comment above as well.