Move some sound code
Move some sound code