[WIP] Refactor MSM

+1