Work in progress on better MMF construction.
Merge branch 'master' of https://github.com/peter-durrant/sandbox