Complete save feature and update api-related calls