Refactoring and adding sound file stuff.