Revert "Revert "Initial edits to P,C,W""

This reverts commit 2473a1cf40bdac70874cf83050f197a61d21fd6f.