Separate out more of WaveNext from EDM-Next