Continued work on edit and remove functionality.