need to possibly handle multiple stored native states
need to possibly handle multiple stored native states


Former-commit-id: 682c0ca92ad5ac21c6291043521b5cc4b956e5ba [formerly 6f93195091112bd5525c5a65ce7e48c974668e12]
Former-commit-id: 78d7d953a348c37010a70aae84f8ea9bbc63f02a
romancow/Sugar,andrewplummer/Sugar,andrewplummer/Sugar,romancow/Sugar