Got the class working

Oscilloscope class now works as expected. Woo!
Merge branch 'oscilloscope_class' into develop