Finished index updates

Ready to go back into main branch