All MCI functions are now cleanly separated.

5 files changed