[WIP] Refactor MSM

yeah, it already was. I removed that explicit normalization and added a test.