Start reorg--encapsulate all indexing logic into Schema