Work on the refactoring. Editing and adding items works