edit item refactor ongoing