Changes for RecTypeB/BW pnl calculation

Added secondary calculation but not finished so commented-out