[WIP] Refactor MSM

I don't know. What do you guys prefer? I haven't really figured out how to use logging as a user.