[WIP] Add TimeValueCalculator