[WIP] Refactor MSM

Or `fit_method_map`?