Added editing and saving capabilities