Cleaning up, adding OSC.h wrapper