slowly adding editing functionality