Added save button and put it up for discussion