Move def til util
check for undefined before overwriting
Add dcf and daycount rules