DCD

Worked on DCD and unit tests more.