preliminary work on editing chores
Fixed merge conflicts