Added a new experimental indexer.
Started to incorporate the new indexing method.