Revert "Revert "Index""

This reverts commit 4a0265938fea7950e82d3dbb66be687a09561057.
Revert "Revert "Revert "Index"""

This reverts commit d037e101061f702bf3fdc52393f447cd01790a4f.