Start finalizing the save message functionality, not done