Merge driver into state manager
Privatize stateManager.advance