Commit of incomplete new indexing code.