Edit is almost working