More M2 definitions, still no worky