started fixing save()