Add state saving
Merge