More work on McMuExchange. Still not tested.