Feature/dcj fixes

Here are some fixes to to the code that allows it to actually work, kinda.

lein test 

returns

Ran 10 tests containing 23 assertions.
3 failures, 3 errors.
Tests failed.