Edit is mostly working