Further refactoring - no save on edit yet