Edited, CommandEdit class should be working