I got CDF's working - sort of.
Fixed merge conflicts and added think at the dismay of Kyle.