working on editing feature now