Revert "Revert "Index""

This reverts commit 29072fe44b9cdf935cdbeb4d9c285e390e9de1bd.