Redid the sound architecture again.  Sorry, but organization is important.