[WIP] Refactor MSM

Haha I was just looking for a function like `clump_unmasked`.  Of course it's buried in np...