More progress on edit
Finished allowing editing items