Refactor sound system.  Still some left to do...