Thinking about this a bit more
Main indexing process is pretty settled