Revert "Revert "Index""

This reverts commit 3641d56a869ccca81216bfd0ac9e2a49884688dc.