MC almost done - still debugging