new index implementation draft

Change-Id: Ifda2f9a9e315d08c944732a4aa4bcc59cb3ca583