Thanks Gill for the input. I had looked at the Klavis Twin Waves as both an OSC as well as a source for FMing my other OSCs.
Will have to look into it again as it seems more than capable and being digital with extra wave shapes is very nice.

"I've seen things you people wouldn't believe... Attack ships on fire off the shoulder of Orion. I watched C-Beams glitter in the dark near the Tannhäuser Gates.
All those moments will be lost in time, like tears in rain. Time to die..." R. Hauer