New data format almost working.
Working now.