M2m

A whole boatload of changes.