add the save button features here too