Ms named streams merge3

This is ready, I think
We probably want to generate separate track_ids if we bother generating ids at all.