Re-do indexing throughout the library - untested
Working single loc version