[WIP] Refactor MSM

good call. fixed.