mostly working, small bug when saving(empty fields)