Fixed Save/Load.  Completely works now!