SoundSystem added, not tested, work in progress