Change approach. Data structure in riff.h. All the computation at the end.