Factored out a lot of stuff to music-score