started working on shared state
Merge remote-tracking branch 'origin'