Move / Undo selection of CPs working. Time to stop and clean up!!!