Merge broke music class. Omeed should look into this.