A first stab at an activity for M2O2C2
Merged changes