also pulled Editor into its own file