Rework some saving mechanics - should help a little with #8