Save state should be mostly working now