WIP new editor version