Discovered problems with partial saves. Double back and debug