begining rework of user editing