Adding in SoundRay
Sound is pretty much working
Fixing merge