WIP: refactor2 before edit form