Adding the tracks should be in a separate pull request, too.