Further work.

Cumulative index, plus testing.