Tdh merged 2

Maybe its OCD of me but I like having all of them for completeness' sake... plus I anticipate recalibrating in UAT