90% fixed on restore state.  Still loading too many arrays, but does restore.