Improved indexing, got querying mostly working. Aggregator is currently broken / time sensitive.