WIP working on editing