working version after refactor
dcefit now works