wip/cddlib
