Starting to add the save function