Refresh for CL and PL private quoting

Hi Paul,

Here's a fresh copy with various mods to accommodate the new CL and PL categories.