[WIP] Refactor MSM

This is a good question, and we should standardize throughout mixtape