Added a TODO for cps-list