Revert "Revert "New Index""

This reverts commit 4dd2e05f9a23b80e8dcf8a6d2d3318ccb79cedd8.