Added some collision OSC information

This required a fair amount of refactoring