[WIP] Refactor MSM