Added save, still some problems