[WIP] Refactor MSM

lol yes. good eye.