Implemented some of the editing functionnality