Intermediate state store
Stores added; stats now using store; aggregator framework refactored;