Makes CPs sortable
Recommitted my tested code.  Not sure why someone else is working on this at the same time...