Phase 1 of edit functionality
Exercise 3 changes