Quick refactor of goal_watcher to a class, rename goal mp3