More work on indexing things