Finish ngContractorCalculator first pass