More work on clist
Preliminary clist
Fixed return type
Updated todo