Start refactoring list edit and new