Things TODO in cdsa
