merging TRLogic w/ rest of TRcalc