States should persist restarts. Closes #42 and closes #32.