Finish section 9.1. Add edit functionality