... Still working on Edit command