Finish Implementing Edit