Fix time calcs
Workin on unit tests