Worked on the ntentan data sources again. More streamlining