Handle cumulative tracks correctly

This may be prohibitive memory-wise with large numbers of tracks