Partial refactoring + new music card.