Things TODO in cdsa