Added more controls and a separate oscillator class.