Working on the edit feature