Initial start of adding editing functionality