[refactor] [#135] First pass of CD refactor: no more gross dictionary parsing
[refactor] [#135] Finish CD refactor!