iteration 2 complete, added editing and destroying