wip
put the loop behind editing()
merge