AppStateContainer refactored
Merge!