Implementing the rest of editing