Re-added soundserver code