Actually working edit controller, and store that updates