Integration with prp-toolkit

It would be nice to be able to minimize parsing between common and prp-toolkit if possible

changed milestone to %Post-critical fixes and improvements