Adding in indexing for everything