[WIP] Refactor MSM

I agree that both approaches have deficiencies.  I guess the thing I don't like about `verbose` flags is that it makes scientific code harder to read.