refactoring of SSM & Track classes, changes to Oscillator