adding underscore
adding underscore path/shim to main
refactor timecalc to on class (vs a bunch of fcns)