Needs to be completed editing methods