Made first MMC changes - still has a ways to go