Old solution only worked on publish, broke editor. Trying another solution.