initial integration
ux integration, new state structure