Revert "Revert "Index""

This reverts commit 979edbed79ddf3fb652b508a24629b0a8fd905da.