More progress toward setting and preserving state
More progress toward setting and preserving state